Use common return
authorMukund Sivaraman <muks@banu.com>
Thu, 26 Feb 2015 14:40:35 +0000 (20:10 +0530)
committerMukund Sivaraman <muks@banu.com>
Thu, 26 Feb 2015 14:45:04 +0000 (20:15 +0530)
babl/babl-model.c

index bb7b7343fd9f7275443659925839143cdd65d3cc..b181ca237e3473723325295035873618d03fce42 100644 (file)
@@ -99,7 +99,7 @@ babl_model_new (void *first_argument,
                 ...)
 {
   va_list        varg;
-  Babl          *babl;
+  Babl          *babl          = NULL;
   int            id            = 0;
   int            components    = 0;
   const char    *arg           = first_argument;
@@ -189,8 +189,7 @@ babl_model_new (void *first_argument,
   if (!components)
     {
       babl_log("no components specified for model '%s'", name);
-      babl_free(name);
-      return NULL;
+      goto out;
     }
 
   babl = babl_db_exist (db, id, name);
@@ -210,6 +209,7 @@ babl_model_new (void *first_argument,
                           "with different components!", name);
     }
 
+ out:
   babl_free (name);
 
   return babl;